Merge "Revert^2 "Move aidl_lazy_test_server to system_ext""