Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  Revert "Snap for 5187456 from 7a6ae4f8fba0d05cdf503d25895e2d164f04c2fe to qt-release"
  Revert "Merge "Use libdexfile external API in simpleperf." am: f8a943e3ee am: 95d21eb5ff"

Change-Id: Idcd684dd708156abd278ac3654a1ab2d1202c063