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

Change-Id: I18976639d4df861b13e4c04ddff38951ba4882b2