merged ub-launcher3-dorval, and resolved conflicts Test: $ make -j 32 dist checkbuild Bug: 62196967 am: 69a49c1d24
am: 6958fda4ad

Change-Id: I1e6e94887d6104166a6fef3d0709cd7ea40432a1