Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp * commit '6bc232a11621740d14f517218d2599a714fb451f': Don't reference CarHome and CarHomeLauncher
Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp * commit '6bc232a11621740d14f517218d2599a714fb451f': Don't reference CarHome and CarHomeLauncher