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

Change-Id: If673886a433d1c02ac19646ab8128ad1b36280c8