Merge "This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e Which includes the following:         - inflating menus from XML and supporting API Level 3 without the need         for version qualifiers on resource directories.         - to NOT include items in the options menu based on the 'selected' item         (that's what a context menu is for).         - include all drawables in the app, instead of using system resources."