Merge \"samples: Use API 23 by default, except for N-specific samples. am:...
Merge \"samples: Use API 23 by default, except for N-specific samples. am: f9872ded am: a52c0506\" into nyc-mr1-dev-plus-aosp
am: 96e04c91
Change-Id: I74e4884372f39e0bfb35497ced60c24a07c087a3