Android 5.1.1 release 17
am 9f87f57d: (-s ours) am b04cfab3: (-s ours) am c3b67d31: Fix sdcard mount flag for goldfish device DO NOT MERGE

* commit '9f87f57d58278b3837d44d96884dc63cbee501ad':
  Fix sdcard mount flag for goldfish device DO NOT MERGE