Update Android SDK and support libraries

I recommend doing a mvn clean install
and in IntelliJ to do a reimport of Maven projects
and rebuild.

Change-Id: I1f6401ed4992a81af074bd79ba8a347599804300
Merge "Update Android SDK and support libraries"