Merge changes from topic "update-prebuilts-r18b"
am: da199e2099

Change-Id: I60663e642cca2bc1352a980b965073d44f456528