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

Change-Id: If9eb2479652cab48c236895a5b36e36b3c082965