Now integrated with Android Studio 0.6.1 changes

Integrated Manfred changes - removing unnecessary steps and cleaning up
the instructions.
Minor updates to 0.6.1-related changes