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