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

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

Change-Id: I39051929a0187f960f2605a8975efb6ddb298084