Merge "libfscrypt: Add == and != operators for EncryptionPolicy/Options" am: 407d714756 am: 1305c50314

Change-Id: I7ce099fb0eba189f7303e85c29094231f0b583f1