Merge "Use OatFileAssistant default filter instead of the dex2oat one"