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

Change-Id: I91738f85ad8672ac3c2489b07e7a3f9e36238814
CRs-Fixed: 1099303
tree: be8bb9028e8b34aea3e299c3fc1b2808b4b17d18
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml