Merge "ext4_utils: Fix return value in e4crypt_policy_get" am: 6c26bba8a9
am: 6c0637a8f5

Change-Id: Icad05c70cdf415c790d8fb0168732a1889ea1a26