Merge remote-tracking branch 'aosp/upstream' into master

15371ad6 Merge pull request #106 from colincross/type_error
ba5bf880 Fix error messages containing variable types
f9dbc3be Merge pull request #105 from colincross/printer_panic
6b6735d3 printer: support multiple skipped comments

Change-Id: Ifb63203723a7a1424422805931ee21382231ac25