Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into...
Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" am: 58982618 am: f7f933b2
am: 8543ca7f
Change-Id: Idc0fa1742e53cb399829ce5fbca2f396388e4095