This fixes a bad merge and contains partial cherrypicks of the following commits to make LayoutLib working again:103d40960d803d77d8904a8fd66f0370cca6ed7f8b7cf689076a08225ceeBug: 15987446 Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
Layoutlib is a custom version of the android View framework designed to run inside Eclipse. The goal of the library is to provide layout rendering in Eclipse that are very very close to their rendering on devices. None of the com.android.* or android.* classes in layoutlib run on devices.