Removing remnants  of menu key

Bug: 131763491
Test: Everything compiles
Change-Id: I43207f4835b295123d6eb2a9a06c90cd5ed29174
10 files changed