Merge "Update LayoutLib Api level to 15." into mnc-dev