Remove unused layouts creating problems
Fix lint build error on InvalidPackage