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: I853f91cc86de7bb33f36ae79dff3c57a876ba67e
Merged-In: Ibe0f1f6beabf994589206687fa950e9ffe1ffcda
(cherry picked from e6a187b7ffd6d82b615f69caf1ce491b8a7a8806)
1 file changed