Merge "Update registering of native classes in HWUI for layoutlib"