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

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

Change-Id: I56a3636c3c299ad4ed2e2e37479f7aef94a56be3
tree: 1b9fe494ffb9281a1c48cf3891b1d060c51e794b
  1. samples/