Make layoutlib run with JDK 11 am: 2a0d164ca8 am: 2e4a364091

Change-Id: I1eb50261dd5b66181f920cec17dcb4c845a9c8e2