Make layoutlib run with JDK 11 am: 2a0d164ca8 am: d8a5da3f27 am: 57b3a82f28

Change-Id: I58c1b5e9df59a0d06fab38e3d69d7b76bd779d88