am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1

* commit '41867b639fb02d9606d4f30359cafc66498f0cbd':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)