[automerger skipped] Merge "[vold] update with incfs_ndk.h" am: 29ee196fb5 am: e296f9cbf6 -s ours

am skip reason: Change-Id I5166c49cf48f353dab35e385571ada517cb751ac with SHA-1 01c4e91c09 is in history

Change-Id: I954834a99ef8253dee7ed1cd5d776dbc405427c6