Merge "Fix the bug that generates multiple definition of references" am: e07e343451

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

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