Merge "AIDEGen: Fix module-info.json modules' dependencies missing." am: be6102078e am: 5867744ad3 am: 906913a842 am: e9c3c50334

Change-Id: I4bcc8828bac7160ed6b1ea7d428612cad76ec9c2