Merge "Update apex rules for dex2oatd"