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

Change-Id: Iffe9e32f37dc54ee4b884fa27aa9b923c434b353
tree: 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
  1. api/
  2. java/
  3. Android.bp