Merge "Jarjar other static libs from entitlement" into udc-dev