am 46bf004f: am 1175aec5: Merge "Fix image not regenerating on changes to bootclasspath"

* commit '46bf004f3825802adc439e8934e9610ddc7fc46a':
  Fix image not regenerating on changes to bootclasspath