Merge mirror-aosp-master `prebuilts/runtime` into stage-aosp-master. am: 204609cdf4

Change-Id: I1209d3fbdafb0344ae1b5b0d599d09c46ed833a3
tree: 6843c8648c0dda8f589f4a5fce2221c486bfcbfb
  1. appcompat/
  2. common/
  3. adb
  4. Android.mk
  5. update.py