Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959 am: 27ffe754a4 am: 1852c380e0
am: 96ea5ccef6

Change-Id: I4f8ba4240106ea84c29b6ae11dfc007af7048eb1