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

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