tree 51dedbab51d0bdfbf3e5e790afef7752f4dac68a
parent da79644e3dd28eaa400dc8c2049889541a52da98
author Paul Duffin <paulduffin@google.com> 1590921350 +0100
committer Paul Duffin <paulduffin@google.com> 1591080833 +0000

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: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)