Switch to using flavors for tablet
Merge remote-tracking branch 'origin/master'