am e15667a9: Refactor and update sample build files to use SDK 18

* commit 'e15667a95072ee7259c5418e178c0da0fd82819b':
  Refactor and update sample build files to use SDK 18