Remove intermediate src dir

Test: unit tests
Bug: 183980865
Change-Id: Ib06bb648341df8b8db88fc58e9b371984e13c73e
66 files changed