vold: use new ioctls to add/remove fscrypt keys when supported am: f3dc4203dd
am: 12a9212ac1

Change-Id: Id3a6b1a43723fb651513c311255e848fd528085b