Add Android/data mounting along with obb mounting in vold am: c1e33a3cc9

Change-Id: If6b5826c9440e45ff54da90ef5b0ccc34b5edb46