Mostly edits to the Android conceptual topic
Merge pull request #1230 from RickSaling/FixACnits

Mostly edits to the Android conceptual topic