Merge "Unify exception order in java.nio.Buffer subclasses"
am: 659e76cdf2

Change-Id: Ia56a427ba667ad3137584bfe7c86f30bfe834275