Update ApiModules to conform to API conventions

Bug: 69739
Change-Id: Ic8e0e4b91a190134b2364a48f766e9661a856bfd