Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  sdk_atv_armv7: TV codecs have been separated, use them

Change-Id: I332f7d3e8fed1d13c2308a74e7bc3cad2bb6deec