Merge "no use readString16Inplace" am: b7c14e4cd8 am: 13499e5a9a

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

Change-Id: I90c7c305bb103aa4854387beef4f005160a3d82d