Merge "Exclude java namespace classes from layoutlib" into nyc-dev