Merge commit '3f5c8c99e20b1b357551b062fad6d5885bc11c89' into eclair-mr2-plus-aosp * commit '3f5c8c99e20b1b357551b062fad6d5885bc11c89': Fix 2129239: Add an override method for enabling the menu key on signed builds.