General cleanup, changed android target to 4.2