Resolve android lint warnings