Remove android.json and code review clean up