merged ub-launcher3-burnaby, and resolved conflicts

Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.

b/22609402

Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae