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

Change-Id: I64062e2c6aafeeb0757ed8ad97666601e93e9735