Merge "Make openssl-macros available to product and vendor am: 03f063fcd9 am: 59abd50cd5 am: 62c85af8cb am: c862ceeb6b am: d6cc615afc"