Fix several Android-L issues