Fix Superuser on encrypted devices

Change-Id: I8f9367b2f83cfe02dd4757d80a6dd111574bb055