Paul Duffin 01fd6ff918 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: I3896d7c91e937f503b49f5df011c21ee51219652
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
Merged-In: I3b78fcbcacc3df787e171d6eedeef1e51b087615
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-02 14:15:28 +00:00
..
2020-06-02 14:15:28 +00:00