Snap for 4620899 from 2ce9e1544377e36cd9a03a9d7aa809911aa735a3 to pi-release

Change-Id: If6d375d9186833abc4442e6b3467f690bd96feb3
tree: af20a3ad7e2953a7c05f622038296f0d5ddc2ad1
  1. Android.bp
  2. CleanSpec.mk
  3. src/