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

Change-Id: Ib6343ea0a95a81bc926aacccee960fd7cfba3928