Merge "Prune apex_remount_tests out of general-tests."