Android S Beta 1
Merge "Drop updated jline version from maven"