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

Change-Id: If51dfb7c76c6593ecf31c2b42712c4ac114d2b83