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

Change-Id: I54d5035cecbfa6785a68c9d454ffb27a5e8346cd