Merge "DO NOT MERGE: disable  android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as  it fails on nexus 10" into lollipop-mr1-cts-dev