Merge "Revert "Use OatFileAssistant default filter instead of the dex2oat one"" am: 2127ad8bfa am: d4c117a5e5
am: b72e072160

Change-Id: I51fdd2f46dc2cbae278e865b18f762f564f4d871