SDK / support lib update to build #2239354. DO NOT MERGE ANYWHERE

Change-Id: I115594143016d248841013a1cd836439c2b3e753
18 files changed