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

Change-Id: I74a694593cc3937a919346c4dc0923883c85beea