Merge "LayoutLib: now depends on tools-common-prebuilt."