Cleanup/Update scripts and fix compatibility with Android 4.2.x