Merge commit 'd9eb0959c6092bc4206e38cac3d6e7529e23aa27' into manual_merge_dfb3683bbef889fa72df975ebe45b0b1f65934ff

Bug: None
Test: automerger
Change-Id: Ie44d65ea066da5e5a7b24c8dea4ec8a560a86168
tree: 1e9446837f0946d3e0f8cc5c9e1c4037ebc5862b
  1. Android.bp
  2. CleanSpec.mk
  3. src/