Begin adding annotations

Using annotations allows for better Code flow analysis. Uses
Jetbrains annotations from IDEA

Change-Id: Id32ae3ca8c49548b2210a779247d2d7319d17b1c
Lint analysis fixes

Flip equals calls to put constant on the left
Remove some unused code

Change-Id: If972c690f7a4a667e249882dfef3b50f79d564e2