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

* commit '3d2b18026754394bac8bdaaf357b39212b1ce1a9':
  Add an included assembly file to prerequisites

Change-Id: I6846dfb5e46fbff70ac895812d0cf3c05c8cf608