Merge "Set sdk_version for libmediabenchmark JNI libraries" am: cd8871630b am: 48eb9aa8db

Change-Id: I7eb3950ed98e29097607de1561a78fb62c3ab968