Move framework and layoutlib api libraries back to being project libraries so that other modules can depend on it. This enables custom widget libraries project to merge through cleanly. Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f