Cleanup: Make android-lint happy.
fix travis