1. layout fixes 2. name changes in sample. (redo of ag/586904 which was lost from lmp-docs) Change-Id: I3a2afafb5b878ba90b8ae6314220af19b3dfbb09
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes new samples for Android Auto. Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1