Merge "Use OatFileAssistant default filter instead of the dex2oat one" into oc-dev
am: fa6bffbbf3

Change-Id: I13cd6903f26557e146a514639c9e4a7a884a5c80