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

Change-Id: I811acf0484c8a23a124f487025eed80898d2a3cd