Merge "Update support lib to use correct current SDK DO NOT MERGE" into mnc-ub-dev am: 761b2d9272
am: a42a88c4d7  -s ours

* commit 'a42a88c4d78ee714eef014672a27e7a2cdc116fa':
  Update support lib to use correct current SDK DO NOT MERGE