New "lint" errors, split Android-specific logic. am: 021685a606
am: e963080dbe

Change-Id: I01f6406bb34bd047543343d58fcb4e7bdc4974b1