Merge "Fix installd mount paths with FUSE" am: b24bb22fdd am: b08f188448

Change-Id: Idd34d1f64deb5f13027165ec6f21748ed2bbe0d4