Merge "LayoutInflaterFactoryTestCase fixes"