Merge "Bug 553815 - [releng] Room models aren't packed into modellib.c.zip"