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

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

Change-Id: I817e5b3f21ea32055e5f9382d10ca3639e13f5fb