am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev

* commit 'aec004e66c5b6bdb11e92a4acd329653128fa216':
  Export build thumbprint only if the product has specified at least one oem fingerprint property