Merge "Update manifest to account for new startup library" into sc-dev-plus-aosp