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

Change-Id: I2faf46a03a2648322e87482fc9803577487a3b21