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: Ic3661b84800f2271fe8893f15e021c5429eb1890
Merged-In: Ib4bae161dc43b3e26720e74fe8120c3e6022fd7f
(cherry picked from dc5abff907ea114b2b0fea07ed37500f5b4290b6)
2 files changed