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

Change-Id: I47660c4d3723e539357e5392fcb9307f21c68027