Merge "Get ANDROID_DATA dir from enviroment"