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

Change-Id: Ic55aa749a4a9b9db28ef3dc144ce3abac4ed32ce