FP2-870: Merge upstream FairphoneLauncher3

- Add braces to one line ifs

Change-Id: I923f33db3795dfac4523b9c61dd7f5cc4cc239c1
17 files changed