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

Change-Id: Ic233ba157e1e0ea7b8b8c4f296b5087b6f3bf309