Merge "Update layoutlib following commit aae0663"