Merge "LayoutLib: move MockView back into its original package." into honeycomb