Merge "Track change of some java.nio.Buffer methods to nonfinal." am: 38a641d29f
am: 5fdb4eb6ef

Change-Id: I08059da73d48200b3a0b1c3612ddb5cca9be7ac2