Merge "Update apex rules for dex2oatd"
am: f6eb989e85

Change-Id: I6506449f99fa050183098d634eb1b5ab4ea896bf