Cleanup: don't build these packages & Use Launcher3

Change-Id: I5341cd6f7f580963f300f14c744348ff7e448a6b