Updated to support the new Android Studio.
Merge remote-tracking branch 'origin/master'