added changes for latest android studio update
added changes for latest android studio update