Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master

Test: built
Merged-In: I0e9438d5fdb01c94077aa22cdf402dee8bf5ec97
Change-Id: Idbd20b12eec0440369b37316f9ab2c84978f7725
tree: 4acd3262b0fcccd69342ac59fda1a325979c162d
  1. tests/