base

Fix a bug where MenuItems would not return consistent results for
item icons initialized from a drawable resource id.

Change-Id: Ieb5245b8fe0e11b2eb788143859da1c0b3657b9f