am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge.

* commit '8ff88c3672461260d1c3b255714d701aec1bfac2':