Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
automerge: 501c710e

* commit '501c710e':
  Fix typo with register native allocation.