[automerger skipped] Merge Android R am: 449f373396 -s ours

am skip reason: Change-Id Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975 with SHA-1 a20b4f3950 is in history

Original change: https://android-review.googlesource.com/c/platform/tools/apifinder/+/1422595

Change-Id: I6eb01865d8b4723239d4bd46fb2a8f69682ba8e6
tree: ea4eeed4c0683dc7fa4aea8d169a104a84c3ae0a
  1. Android.bp
  2. src/