Merge "use prebuilt for the shim" into nyc-dev
am: 5a7abbc3a2

* commit '5a7abbc3a2f3ad316f1108980bb0f3bc2ce70280':
  use prebuilt for the shim

Change-Id: I0d663728828aab166554ab6171838bd36309df5f