Merge changes from topic 'no-bionic-prebuilts'
am: a50902e4dc

Change-Id: I6053e5c9b15d511c28441a0252b47f56584c63cc