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

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