Merge "Use NORMAL synchronous mode for WAL journal mode" into pi-dev
am: 4ca34d7bd7

Change-Id: Ie6b240012c898d41334829b67b8664e9fdaa04ae