Merge "Provide java_defaults as a counterpart to the settings.mk file"
am: ad8b5c9939

Change-Id: Ia4e52707d858457ebbcfdaa14c27b978eee7f4d1