Merge changes from topic "am-ff7afb70ce404e6eaa5f5b013c58b9d5" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Migrate libandroidemu to .bp on the guest am: a8f5675d76 am: ae65fdad30 am: ebb903edf5 -s ours
  [automerger skipped] Remove some references to PLATFORM_SDK_VERSION am: 3769cd25f5 am: 370200000e am: 4ffed6d661 -s ours