am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4

* commit '7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':