Update support lib to use correct current SDK DO NOT MERGE

BUG: 26714403
Change-Id: I2153dbda365f4552a14df1f432239bddfbbbef00
21 files changed