Merge "Update prebuilt shim apexes with the ones build on server" am: 1ac34527fb am: abd1d41a40

Change-Id: I67eb128461be360815a329c00f9515109c942867