Merge "fix new It Strings" into android-4.4
tree: 80b5920722f722c0535f67bbad118b70e5c4ab81
  1. res/
  2. src/
  3. Android.mk