Merge "Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev am: 9635756473 am: a4afe006b1" into nyc-mr1-dev-plus-aosp