DO NOT MERGE ANYWHERE. Update sdk and support lib to build 1947943

Change-Id: Ib61b7cf94e7f220dc5f10dd7f5beb6f51aed3234
17 files changed