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

Change-Id: I1209d3fbdafb0344ae1b5b0d599d09c46ed833a3