Stop splitting support lib into modules in Android Studio.

Test: studio and commandline still compiles
Change-Id: I9f8402892fe44456161a1eb6836d99a18047c6d7
5 files changed