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