am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.