Make all chapters' samples more consistent and up to date

Review URL: https://codereview.appspot.com/58320043