Snap for 4832339 from bda0ebb465430b669a3fac408447eebd15b769f4 to pi-release

Change-Id: I54f145bcedb5c919609ada3ad9eefd95bc467532
tree: af274af3fdaf3fefe7da1b2afec7e37528e3d724
  1. common/
  2. tools/
  3. Android.mk
  4. test_defs.sh