Merge "Link resourceobserver_aidl statically in tests"