tree f1cb1d3aef8b1270dbdfbb6d4c334640eb944f51
parent dcafe747b87cf0955a805a166febcedd179296a9
parent 085d0fbcb414a70400c6a373a0465b8b5dc9a1d9
author Dirk Dougherty <ddougherty@google.com> 1500671205 +0000
committer android-build-merger <android-build-merger@google.com> 1500671205 +0000

Merge in some android customizations. Minor cleanup. am: a42162715c am: c4978c1ccc
am: 085d0fbcb4

Change-Id: I2edcaf754a346ba3f2e6e7d66a9a764bf6af22c9