This is needed when using Java 11 as target. Test: m Bug: 195387473 Change-Id: I18abbdfee4039f9a366070b730930396ff4c210e