Merge "Retry compiling a previously failing package after update" into nyc-dev
am: ffdaae0

* commit 'ffdaae004b403714dbf01b47a31065e67eec0177':
  Retry compiling a previously failing package after update

Change-Id: I490d1921b992be456e244c553416d8a66af3cb7a