Merge "[vold] update with incfs_ndk.h"