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

Change-Id: Ia04af4d1fedff615229e34ed6d4f24cf5861d4f4