Fix inconsistencies in Android annotations