Merge changes from topic "b174856119_aosp"

* changes:
  Drop prebuilt files to android source tree.
  Update CTS shim