Merge "Revert "Use /data/vendor_ce/0/facedata for FaceHAL's secure storage"" into qt-dev