Snap for 6450912 from 40a614c5faabdae3804f4ae668045b3b4c992c32 to mainline-release

Change-Id: Ie3017cfe7ae51a458bffaee3373cbaeb647fa140
tree: dc910e6964d46048775869d290dd8953378f5a54
  1. src/
  2. Android.bp
  3. CleanSpec.mk