Merge "Revert "Update sdklib-prebuilt.jar."" am: 3316ac8aad
am: f265a158f6

Change-Id: Ia6de5795f0bb9135427f9fcd3479f1d132f223bf