am 80d45bd1: am b97df048: Merge "ART: Native bridge command-line parameter"

* commit '80d45bd196978c41af29eea7b2b58f67f637e0ed':
  ART: Native bridge command-line parameter