Merge "Fix HAL and AIDL files to be consistent with API generation tool."