Merge "Fix missing gear icon on "More" toolbar button" into pi-car-dev am: 011ab9980a am: 892c95ced7

Change-Id: I8765c1a012d99b5394c32260aa6128c628f96400
tree: c3836ae499ba977a39a2dfe66d817709f84d636e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg