Merge "no use readString16Inplace" am: b7c14e4cd8 am: 13499e5a9a am: 002ef2d90c am: 49814c5555

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1486503

Change-Id: Ie2234d77666257b716fd5efc6dc8f98ca22c15d0