Merge "Update prebuilt shim apexes with the ones build on server" into qt-dev
am: f8d2c51dc7

Change-Id: I920b5aacd7273f966266d897791ddfff2062018d