Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
am: 80bb035d4e

Change-Id: I35bdd8fe5b80917b8b574e97f10f77df59045efd