Merge "Add ability to build unbundled builds." am: e0457574f4 am: c1c5bd11a4
am: 4865f4e6b6

Change-Id: I3d311a4710e8742e9dd94815e11668ddb5e8d7ca