Address further API council comments. am: 4dd17a5113

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