Merge "Fix layoutlib by avoiding Java7 calls"