FP2-870: Merge upstream FairphoneLauncher3

- Replace with array initializer expression issue fixes

Change-Id: I57b0083e619887897d5bb38780c9b9e617037876
10 files changed