Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread