Merge commit 'e96c5af079c1cde7a0cf51643d26f63185f749f0' into HEAD
Change-Id: Ibc6071b489e97824a1345c06b8b52bc1bdabdd34
tree: 6459a22cdf76a6e5325f21d9073c2b40f70575bd
  1. src/
  2. Android.bp
  3. CleanSpec.mk