Updated Android project for 4.x and above