Fix small bugs identified in Android App Testing.