Snap for 4632767 from 8e0b8e94efd547565a571a1bd5c4b2f62f59c168 to pi-release

Change-Id: I943d57dd855327a091c03e3c10807af47cdc9ab7
tree: fba64aba5edda65b899f8fc627940d30170d8b72
  1. src/
  2. Android.mk