Revert "Updates to keep up with Android Studio 1.0."

This reverts commit 129fa455db431738f51f22e704c7c34c2ca0f697.