Clean menu creation code.

Change-Id: Ie8ed04e74beef78208946688ee2f33297de0b6d1
6 files changed