Merge "Fix array-related errorprone warnings" am: 2c53a8b3ec am: 9e74adbe74

Original change: https://android-review.googlesource.com/c/platform/external/mp4parser/+/2185074

Change-Id: Ia2b91e6bae15263d3a75715809e564b0440b0bc1
Signed-off-by: Automerger Merge Worker <[email protected]>