Merge changes from topics "appfuse-revert", "appfuse"

* changes:
  Revert "Change AppFuse mount location to vold namespace"
  Merge commit 'c4381df50a0f226a60a63c786f57ed74e9c4fc6b' into manual_merge_c4381df50a0f226a60a63c786f57ed74e9c4fc6b