A change in build.git now puts the one that's automatically generated. Change-Id: Idced9ea6176152400189203b84809c9a5a3fd92e
b058af05