Merge "ART: Use v2 version of NativeBridge struct" into mnc-dev