Merge "Fix LayoutInflaterFactoryTestCase failures on API 21+" into mnc-ub-dev