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

* commit '1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
  LayoutLib: move MockView back into its original package.