merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
merge in master-release history after reset to master
Revert "Remove AOSP support"

This reverts commit ce88a53fd1b9be88d3ff4162140337f60214ec0a.

Change-Id: I8a2794f1d853e65d1ac2536641b1dec919f88fce
Merge "Revert "Remove AOSP support""
am 0f134554: Make the remote submix audio module available.

* commit '0f134554a4f361e720f7b65c7b0416a5cec43fb6':
  Make the remote submix audio module available.
am a9ee6103: am 97f7000f: am 34319873: Switch to aosp_* product name in the lunch menu.

* commit 'a9ee6103ceac5b34aeeeba95c9890ab6488b05a6':
  Switch to aosp_* product name in the lunch menu.
am cdfd9227: manta: update kernel prebuilt

* commit 'cdfd922741943ad27743c0fe8b541e73a388b23d':
  manta: update kernel prebuilt
am 1f7464ee: Manta: NFC: Fix IsoDep params.

* commit '1f7464ee04c97de37b8c01778fb330bbe7b363fc':
  Manta: NFC: Fix IsoDep params.
am f64e2930: Merge "manta: prebuilt kernel (fuel gauge charge counter resolution)" into klp-dev

* commit 'f64e293049d87f1a1d56ea90d48e200ef75344ec':
  manta: prebuilt kernel (fuel gauge charge counter resolution)
am 0c415a65: manta: Update kernel prebuilt

* commit '0c415a65a3613df75a6803e3704c27b8b35a0245':
  manta: Update kernel prebuilt
am 5f3ccad6: manta: wifi: Use separate p2p config overlay

* commit '5f3ccad6cd893f66e3123262aeca4dbbc637f8c2':
  manta: wifi: Use separate p2p config overlay
am d317f1b3: prebuilt kernel (fix for mfc/omx)

* commit 'd317f1b3cde183716a8233a93cf96ab020e6acac':
  prebuilt kernel (fix for mfc/omx)
am d90651f5: Merge "Fix uninitialized variable which could cause extra sleeps" into klp-dev

* commit 'd90651f58072574f8ad2044008002cb1b4138852':
  Fix uninitialized variable which could cause extra sleeps
am 9f22f352: Merge "Manta: NFC: Route IsoDep to the host by default." into klp-dev

* commit '9f22f3520751597bd5cd0ef9ca01b42877856b1c':
  Manta: NFC: Route IsoDep to the host by default.
am b88856d2: Merge "Implement HAL API get_presentation_position" into klp-dev

* commit 'b88856d2a7604989df95a84cceabbbc1916762c7':
  Implement HAL API get_presentation_position
am a0a394d7: Merge "Enable richer SD card permissions." into klp-dev

* commit 'a0a394d7cfc654c142e371d6d27a43c2c0bfb302':
  Enable richer SD card permissions.
use the default recovery UI

The key handling we use for manta is now the recovery default; we no
longer need a subclass of ScreenRecoveryUI.

Change-Id: Ic0faefeb3e0eb4bb9eb86b9a75628dd1a4a43f3f