Merge \\\\"sdcard: Use std::map.\\\\" am: c15ab6e2c6 am: 0d039c4c44 am: c8a37397cc
am: 484c41f219

Change-Id: Ia48a3bf1e9049f1131ae13bbdc4ac184ab950008