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

Change-Id: I3554570492eb43213f8df402743c7064d8757897