updated to work with new android gradle build 0.12.+