Merge "Move benchmarks from tests/ to new directory benchmarks/" am: 3fb1bca5b1 am: 67c0d631a2 am: 4c03df5f3d am: 03c1ea4d5b am: 827f3a05fd am: 8e60862585

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1353244

Change-Id: I652562061b7b84c99f84768acccfa7389e4fdde2