Merge "Add rules to build the factory bundle." into ics-aah