Merge "Update sdklib-prebuilt.jar." am: aa9fcfeca2
am: 2d2b7178cd

Change-Id: I29571c9636d56d230ed17fc4af4aae4603fc38b8