Merge "Update linkerconfig configuration format" am: 6f27296e13

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

Change-Id: I2c43435da640e5eb29502529a42cccb4e62c008c