Merge "Add ConfigInfrastructure stubs lib to Android.bp"