Merge "Revert "Update current API file rules" am: f3c76c7ec8 am: 628f6a9d2c" into rvc-d1-dev-plus-aosp