Merge "Add java_defaults to Android.bp and update default"