merge in pi-release history after reset to master
tree: 8a1b16b281347d43cc2e46aca6cbba1b0978bebc
  1. msm8998/
  2. Android.mk