Merge "Set min SDK for android prebuilts" am: e3d473554d am: e6b1af5606
am: 15aa878a4e

Change-Id: Ib013c7123eaf970e91ed06dd7f460e8172c1b61a