[automerger skipped] Merge "Provide java_defaults as a counterpart to the settings.mk file" am: ad8b5c9939 am: 9870b5659b
am: 9624d83483 -s ours
am skip reason: change_id I9e57744737430ff7e1ab57891dc81d1dd3bbcb83 with SHA1 0f019d083e is in history

Change-Id: Ibedddae9ccee535136acc493b64f8412388b239b