Add Launcher2 & Trebuchet

Change-Id: I8b9ae7de5828c69a35cc19b4ee0dd55e9bfbb357