Catch-up master to master-layoutlib-native

Now that the native version of layoutlib is the only one being
developed, catch-up the master branch to using the native layoutlib from
master-layoutlib-native.

Bug: N/A
Test: N/A
Change-Id: I8258ae047d04b2ec042ca8d3e78d8e3cce8fde73