Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3202c6ee2a

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