Merge "Add METADATA to jline: BSD+Apache2=NOTICE" am: b237ebe901 am: 619aadcb70 am: 17e099180f

Change-Id: I91b060b063982bfa26bd3e630edc0ab89d6a41f7