am 610b14ac: am e3f5a9c5: Merge "Update libandroid.so for API9 .. API18"

* commit '610b14acd4a3ebc565f88d96a6aa274b9bd75a3d':
  Update libandroid.so for API9 .. API18