Merge "ART: Increase the number of potential instrinsics"
am: d7d5ed9531

Change-Id: I81cc9e3de96f1c83e81e009c24c996104702657e