am 8a89bfad: am b1cf9c5f: (-s ours) am ff6b7322: Merge "Update the contents of the README.android file to match the latest code"

* commit '8a89bfadc93e8179cd10a43fec7dd1c56b696830':