Merge "Add new configuration loading path for apex module Cronet" am: a960204edf am: d5f5adad39

Change-Id: I76afbbbb8df96f44749889573a1b1b5bc74aa07d