Merge "Add ConfigInfrastructure lib to Android.bp"