Merge changes Iaee1b711,Ia3dd0761
am: 881673cb45

* commit '881673cb45449f9fbc9fa496cf1d777868ee9da8':
  Generate libc version-script for brillo
  Revert "Don't verify version scripts on 32-bit Brillo"