Snap for 4593582 from ed9129441bd6f56f84cc836a1514175b76af712c to pi-release

Change-Id: I1a2a7480d7882705a4a002101f22a422909f90b7
tree: 4fd31ff1308c1d6bbb30819b7821f73e4c02a4f1
  1. src/
  2. Android.mk