Revert "android-studio: include shipped extras in package (i.e. Support Libraries)"

This reverts commit 2bfb22fd76844a410adfb7facbd7484bff687f56.
android-apktool: aapt got moved to build-tools