mainly to contain the fix about bognus array-bound checking
See https://android-review.googlesource.com/#/c/125800

Change-Id: I22c98ebab9dee5b94fe2b13d6a2a2da9e7fa12d3