Merge "Restore "Remove Support Library from SDK build"" am: 3e5a76eb -s ours am: c4c497b6 -s ours am: 13eb6e0d -s ours Change-Id: I0e1584e848e9caab23136b6ec26f7e6bcfae37fb