Back Merge from rel branch to dev branch  after N-MR1 upgrade

Change-Id: I82c3a225008ec12ecf2427cfb7245bf5e2111a79
CRs-Fixed: 1099303
tree: 337dd1bfd051fdf8806f22aad0b4e3e2f90c9bf5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle