Merge "vold: allow ioctls BLKDISCARD and BLKGETSIZE"