frameworks-menu: Merged jb-mr1.1-release branch of aospX