Fix build; lint fixes

Properly rename DiffActionBar to FilesCAB
Lint fixes for string comparision so that the constant is on the left

Change-Id: Ifff2e7ffc2528b69fe46a05bd76d92cd2fca8616