[automerger skipped] Address further API council comments. am: 5d87a808e6 am: 5e5a6a01c8 -s ours

am skip reason: Change-Id I0b2526b58f0437f499ca1bbbc55fbf875003e4df with SHA-1 4dd17a5113 is in history

Change-Id: Ic9bfdcba663f187a7626604f02d7461e7a23bcf4
tree: cc09a95dbb1038ade557743dd62228dc4df6c791
  1. staticlibs/