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.
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Change-Id: I39e2033400a769568dd594eb2861e7f3ed42ce20
(cherry picked from 8b864fb4)