Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6

Change-Id: I0173898669ca7d4b3a03449d2488f69cddb0ba3f