Merge "bootable/recovery wants EqualsIgnoreCase."
am: 89e99f9e0e

Change-Id: Id7480e1a1fec5626a0bec22c2128dd419533e1aa