Merge "Revert "Remove "libjson" Android.mk"" into main