Updated imports to support android API 10+