Merge "android::base::ResultError/Error are template classes"