Merge "Update layoutlib to match java library changes" into oc-dev am: d88676f363
am: 7ce6dac7c9

Change-Id: I5a616707aec84b1da1b5ed541def5fc47f199387