am 73021682: resolved conflicts for merge of 8c25fd56 to mnc-dr-dev-plus-aosp

* commit '73021682133ab4586975ccc826769a57403195c7':
  Read BUILD_NUMBER from file in rules