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

Change-Id: If6121f99d126570f9e38e2c7097841526750758e