Merge "Use extern "C" instead of __BEGIN_DECLS" am: 9e3c5380df am: bdbeb34369 am: ef980f71b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2408572

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