Additional round of Android related improvements