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

Change-Id: I27cf0237c56e1a932746bdc147e842381374601d