Merge "Dist android-non-updatable.jar for sdk"