Upgraded to android-19. Cleaned up the code.