am fa610339: Merge changes Ia3732dc4,I47cad3c2

* commit 'fa610339baf67da107ba040930352c974b38256f':
  Check and normalize defines during import
  Remove ripemd