am 6953cdae: (-s ours) am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '6953cdaebad1fad6f25dd9357409d70310cfd116':