am a2cfb78f: resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp

* commit 'a2cfb78f7931102f6f6db152664c10accf92d3c6':
  Do not update previous_XXX.mk when there is no change