At the same time, fix the targetSDK such that we don't have OLD_SDK installation error. Change-Id: Ie8e1fb88afef2a0e662b046e1a4ebf6522299bb8
b/22564270 Change-Id: Id4f721cfd6e9450d8346410997ecfc1f2c3926c1