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

Change-Id: I3686e4c9b9ea2079747929359f92f8973bdb8679