am d1314040: am f4790e6f: Separate platform files and samples by API level.

Merge commit 'd1314040fefdae9ebade02e2af072a3cf6e9d844'

* commit 'd1314040fefdae9ebade02e2af072a3cf6e9d844':
  Separate platform files and samples by API level.