Merge "Add an included assembly file to prerequisites" am: 9a1e6a1932 am: 3d2b180267
am: 1d73da2e93

* commit '1d73da2e93a57105e14d0f343f8d567401d18dcf':
  Add an included assembly file to prerequisites

Change-Id: I47b881bde6bec7456968a6282846acb848bfcdef