Merge "Remove critical option from apexd and apexd-bootstrap" into rvc-dev