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

Change-Id: I0afbc3c3fbc03b0e55d6bc1a4da9f4b3d384ad9d