Merge "fscrypt option parsing depends on ro.product.first_api_level" am: c96804e159

Change-Id: I228041748cc3e479ca0ee39da9e722711f3f178f