Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df am: d8a22925f5
am: 373a13c0ca

Change-Id: If5a60097dcd9986f468a2fbae8a7d23ed44f6453