Merge commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8' into eclair-mr2-plus-aosp * commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8': Refactor class/method names used by layoutlib_create.
Merge commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8' into eclair-mr2-plus-aosp * commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8': Refactor class/method names used by layoutlib_create.