Merge "Update layoutlib to match java library changes" am: ac6414524c
am: 72ae1a8958

Change-Id: I729b6f1c3e8d35ee7710f7d34c1e2563a5a198c3