Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 am: 0d9ed29541
am: 3777c4b859

Change-Id: I208d2804c2fc6634c8464fdb700756ade977b908