[automerger skipped] Merge "Remove libcrypto dependency when building...

[automerger skipped] Merge "Remove libcrypto dependency when building com.android.media" am: 853ef5c8 am: 1e1bc0ab -s ours am: 59db65fb -s ours am: 85badef3 -s ours am: 096c6866 -s ours

am skip reason: Change-Id Idbd6b4bc3a9f7edc63bf5b450d02182032be37b2 with SHA-1 f11c6776 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1336079

Change-Id: I61b3bcaee111a0750b927da59356dd9ed45a9d44