Lie about the value of java.version am: bc2d9e8197
am: bbe54875e2

Change-Id: I8206fd8f22a86922f6206333b803954b456d41cd