Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I4c4c89b4c967bb2c749c387272dc0e486f50ae15
tree: ff9c77a60037cd8b7659559220d57ad9a5f09161
  1. lib/
  2. test/
  3. tools/
  4. Android.bp
  5. LICENSE.TXT