Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74
am: 51403950b3

Change-Id: I59906380334fd96d70044b7d5253ea703ab08690