am 6b3f9b3a: Clean up support library samples.

* commit '6b3f9b3ac9327d22e73f4aa2b61e4fb6c3933a33':
  Clean up support library samples.