Merge "Fix LayoutlibTestCallback.getResourceId"