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

Change-Id: I84075afc3e4a0f5925bf693ddfffc8ad1d684697