Merge changes I1dd435e3,I779e4d49

* changes:
  Allow gsid to read from /storage/emulated/...
  Allow gsid to read from FIFO