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

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

Change-Id: I1a241dc073a45a7660b9ce44bec7f814669c1fdc