Merge "Revert "Add ota_dexopt_aidl_interface""