Merge "hikey960: enable File-Based Encryption"