Don't pseudolocalize untranslatable strings.

bug: https://code.google.com/p/android/issues/detail?id=63004
Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
Merge "Don't pseudolocalize untranslatable strings."
Remove unused field from MediaMuxer

Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
Merge "Remove unused field from MediaMuxer"
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base into HEAD