* aosp/upstream: Set fields in CreateModule to match current module Test: m checkbuild Change-Id: I075035df80a924dda4805921a05325de57abce61