Merge changes from topic "apex-aidl" into main

* changes:
  Populate apex module info
  Include module info in dump output