Make layoutlib run with JDK 11 am: 2a0d164ca8 am: d8a5da3f27 am: de260da43c

Change-Id: Id80d43fa783b1cd8d99e05c17ac702ee08fde50f