Merge "Enable native_bridge_support for jsoncpp" am: 805300e850
am: a5af0d6380

Change-Id: I51a2ba686dfdf3e753d4245fdcb14eff61b64638