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

Change-Id: I6e2f82dd543d9d685240a902a782eb2ccda4a19a