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

Change-Id: Ief5b7e264fbf62c0f39003103171fc5ddaca7490