... which makes things much simpler, and the custom target now only
contains Java classes.

Change-Id: I4aead3a2468085212e2384cad97e34f9cfce7270