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

Change-Id: I7fd70578991b1c26a868d4cf856a41b2a69b1319