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

Change-Id: If92f66a9eb40356e671c985a324f75d36cf0ae15