[automerger skipped] Merge "Update stubs to use libnativehelper for...
[automerger skipped] Merge "Update stubs to use libnativehelper for java.nio.Buffer access" into qt-dev am: 572f0aed
am: 7be67b79 -s ours
am skip reason: change_id I5e4978f4523d4f80bc6813740f2ed9cb57c6d9f4 with SHA1 13309b3d is in history
Change-Id: I71653ef6822d4537e6ae06a2032422b5ca217af8