Move some framework modules into more appropriate components. Test: m cts Bug: 432581059 Flag: TEST_ONLY Change-Id: I85754fb8540b703e5411f0e6a9f31fc8d2ed8553