Switch to JDK build 1.8.0_152-android-4343112-1 am: bb7dab15c8
am: c06994487c

Change-Id: I3236f9846a787f27a8eb93d8a4aaf9fb00195ba5