Fix issues with android lint

Mainly style issues, some redundant items
Add slight error checking based on inspection