Merge "Update dex2oat filter"