Merge "Restore "Remove Support Library from SDK build"" am: 3e5a76eb35  -s ours
am: c4c497b643  -s ours

Change-Id: I7060bcdc967cd86e5f2e61ec078e4da59f0b17f8