[automerger skipped] Update current API file rules am: 34c37ad82e am: bc2e30ecb7 am: 48a752057b am: 6eebae12fb -s ours

am skip reason: Change-Id Ice6ab935723a072dbb68c4fe32199f86ec4d983a with SHA-1 34c37ad82e is in history

Change-Id: I90ab7eae176494366e56381c758ef1868dc6f183
tree: 41df9aa68db679ddb8f7aa7fbcaa38b70b83ed29
  1. Android.bp
  2. api/
  3. java/