am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.

* commit '058f1f0fa00007bbd8856bf32c49db6f765dbca4':
  Update LayoutLib version for API 21 to 2.