Merge "JLine: convert to soong" am: abf7aa1401 am: 667b8866db
am: 486ecfedc8

Change-Id: I25434bc1e240565149509548b39097962933f3bf