Merge changes from topic "presubmit-am-c54e2eff303d4593a6ebf99d28c702a7" into tm-dev

* changes:
  [automerge] Move stubs to the bottom of Android.bp 2p: 387b06d843
  Move stubs to the bottom of Android.bp