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

Change-Id: Ic95f1899f6235f03485c410cb4c8e3c77a1722a7