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

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