am fb445cd9: Merge "Various lint error fixes." into ub-launcher3-burnaby

* commit 'fb445cd97d828fa2d9fe3190b25524e39038cd0b':
  Various lint error fixes.