Merge pull request #3492 from sigmabeta/android-update-build-tools [Android] Update build tools + support libraries
