Merge "Turn aidl_format on"