am e81271f5: Merge change Id97eba9f into eclair

Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-plus-aosp

* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
  don't add "ota-rel-keys" tag to build fingerprints