Merge "Fix the bug that generates multiple definition of references" am: e07e343451 am: 2706b0c951 am: 0dff861946

Original change: https://android-review.googlesource.com/c/platform/development/+/2379448

Change-Id: I8802167861388ea100e5e45d04d97262ed0a874d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>