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: 2f66c70bba

Change-Id: I31068e97e820dd4049205995eb7096630765a441