Merge "ART: Fix libnativebridgetest dependencies"