am 357c3a8f: am b16bbf75: Merge "Fix sdcard mount flag for goldfish device"

* commit '357c3a8fd5ff502fd3dd311447faa7fdb4ba817e':
  Fix sdcard mount flag for goldfish device