Merge "Revert "Revert "Use OatFileAssistant default filter instead of the dex2oat one"""
am: a215c5b2ba

Change-Id: Ib6681ffb62e0f6165e4d3f9604c77521ec7822e9