Merge "protolog: improve build time of frameworks/base/services"