Merge "System services detect and register app CPU ABIs"