Switch to standard naming scheme

Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: Ibe0f1f6beabf994589206687fa950e9ffe1ffcda
1 file changed