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

Change-Id: I59f37ef70dd6eec14677934b50f0463ab0111ba9