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: I44d0378125f37a1f97e7b71572cc8c5acb88b4a9
Merged-In: I98bd269cd010c9a92b4a8c4b8cb5d0e8680d2c5d
(cherry picked from 630217770ea26d3497c11eaaf1342da9be05cac9)
1 file changed