Android R Beta 2
Merge "Add METADATA to jline: BSD+Apache2=NOTICE" am: b237ebe901

Change-Id: Ibcca8410929d791358d756676588763539754473