Merge "Merge "Add explicit nativebridge header dependency to art test." am: 6d2e76b421" into stage-aosp-master