am 4d6299be: am 6b3f9b3a: Clean up support library samples.

* commit '4d6299be11e4346b6abfe16f71114f3cea34d926':
  Clean up support library samples.