Mostly edits to the Android conceptual topic