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

* commit 'b1cf9c5f2a808612bdca0a0be44fd08d8921a508':