[automerger] Some launcher3 fixes so that it compiles with different configurations am: d0f43ceba7 am: 9e40ef9894

Change-Id: Ie3eed75fab341dfe274a566c71d6b6fdbab70854