Merge "Restore "Remove Support Library from SDK build""