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