Merge "Fix up the makefiles and some samples."
am: 2473cab

* commit '2473cabd0df86120f54c7a4cb59559fec86ac5eb':
  Fix up the makefiles and some samples.

Change-Id: I7eaacf9a7dbbb7de104518685447d5b4e402dcaa