Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':

Change-Id: Idb90741cd749586c478abefa856a249cfba8eaf7
diff --git a/Android.bp b/Android.bp
index 3ce107c..0d9bb12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,6 +62,9 @@
 // the function-based keymaster HAL API to the message-based AndroidKeymaster API.
 cc_library {
     name: "libkeymaster_portable",
+    lto: {
+        thin: true,
+    },
     srcs: [
         "android_keymaster/android_keymaster.cpp",
         "android_keymaster/android_keymaster_messages.cpp",