Merge "Removed unused Face Unlock aidl files" into mnc-dev