Merge "Split apart frameworks/compile into sub-projects."
am: cb8a150896

Change-Id: Icb4f69125cbe33f5801df5290c12488a570a5777