Merge "Update linkerconfig configuration format" am: 6f27296e13 am: 91fecb51c2 am: e1311102cf

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

Change-Id: Ie8f5c73e15440eb61b5f78ce0f65f77e7e17d5f1